<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="en">
<head>
<title>Source code</title>
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
</head>
<body>
<div class="sourceContainer">
<pre><span class="sourceLineNo">001</span><a name="line.1"></a>
<span class="sourceLineNo">002</span>/*<a name="line.2"></a>
<span class="sourceLineNo">003</span> * Copyright (C) 2012 Archie L. Cobbs. All rights reserved.<a name="line.3"></a>
<span class="sourceLineNo">004</span> *<a name="line.4"></a>
<span class="sourceLineNo">005</span> * $Id: MergeStrategy.html 947 2014-11-12 22:14:09Z archie.cobbs $<a name="line.5"></a>
<span class="sourceLineNo">006</span> */<a name="line.6"></a>
<span class="sourceLineNo">007</span><a name="line.7"></a>
<span class="sourceLineNo">008</span>package org.dellroad.stuff.pobj.distrib;<a name="line.8"></a>
<span class="sourceLineNo">009</span><a name="line.9"></a>
<span class="sourceLineNo">010</span>import java.io.File;<a name="line.10"></a>
<span class="sourceLineNo">011</span>import java.util.List;<a name="line.11"></a>
<span class="sourceLineNo">012</span><a name="line.12"></a>
<span class="sourceLineNo">013</span>/**<a name="line.13"></a>
<span class="sourceLineNo">014</span> * Available merge strategies for a {@link GitRepository} merge operation.<a name="line.14"></a>
<span class="sourceLineNo">015</span> */<a name="line.15"></a>
<span class="sourceLineNo">016</span>public enum MergeStrategy {<a name="line.16"></a>
<span class="sourceLineNo">017</span><a name="line.17"></a>
<span class="sourceLineNo">018</span>    /**<a name="line.18"></a>
<span class="sourceLineNo">019</span>     * Use our version; discard other version.<a name="line.19"></a>
<span class="sourceLineNo">020</span>     */<a name="line.20"></a>
<span class="sourceLineNo">021</span>    OURS {<a name="line.21"></a>
<span class="sourceLineNo">022</span>        @Override<a name="line.22"></a>
<span class="sourceLineNo">023</span>        void addOptions(List&lt;String&gt; args) {<a name="line.23"></a>
<span class="sourceLineNo">024</span>            args.add("--strategy=ours");<a name="line.24"></a>
<span class="sourceLineNo">025</span>        }<a name="line.25"></a>
<span class="sourceLineNo">026</span>    },<a name="line.26"></a>
<span class="sourceLineNo">027</span><a name="line.27"></a>
<span class="sourceLineNo">028</span>    /**<a name="line.28"></a>
<span class="sourceLineNo">029</span>     * Use other version; discard our version.<a name="line.29"></a>
<span class="sourceLineNo">030</span>     */<a name="line.30"></a>
<span class="sourceLineNo">031</span>    THEIRS {<a name="line.31"></a>
<span class="sourceLineNo">032</span><a name="line.32"></a>
<span class="sourceLineNo">033</span>        // Note, this would be easy with `--stragegy=theirs' except for this jerk: http://marc.info/?l=git&amp;m=121637513604413&amp;w=2<a name="line.33"></a>
<span class="sourceLineNo">034</span>        // Links:<a name="line.34"></a>
<span class="sourceLineNo">035</span>        //  http://stackoverflow.com/a/4969679/263801<a name="line.35"></a>
<span class="sourceLineNo">036</span>        //  http://stackoverflow.com/a/4912267/263801<a name="line.36"></a>
<span class="sourceLineNo">037</span>        @Override<a name="line.37"></a>
<span class="sourceLineNo">038</span>        public void merge(File dir, String other) {<a name="line.38"></a>
<span class="sourceLineNo">039</span><a name="line.39"></a>
<span class="sourceLineNo">040</span>            // Sanity check<a name="line.40"></a>
<span class="sourceLineNo">041</span>            if (other == null)<a name="line.41"></a>
<span class="sourceLineNo">042</span>                throw new IllegalArgumentException("null other");<a name="line.42"></a>
<span class="sourceLineNo">043</span><a name="line.43"></a>
<span class="sourceLineNo">044</span>            // Simulate --stragegy=theirs<a name="line.44"></a>
<span class="sourceLineNo">045</span>            new GitCommand(dir, "merge", "--no-commit", "--no-ff", "--strategy=ours", "--", other).run();<a name="line.45"></a>
<span class="sourceLineNo">046</span>            new GitCommand(dir, "read-tree", "--reset", other).run();<a name="line.46"></a>
<span class="sourceLineNo">047</span>        }<a name="line.47"></a>
<span class="sourceLineNo">048</span><a name="line.48"></a>
<span class="sourceLineNo">049</span>        @Override<a name="line.49"></a>
<span class="sourceLineNo">050</span>        void addOptions(List&lt;String&gt; args) {<a name="line.50"></a>
<span class="sourceLineNo">051</span>            throw new UnsupportedOperationException();<a name="line.51"></a>
<span class="sourceLineNo">052</span>        }<a name="line.52"></a>
<span class="sourceLineNo">053</span>    },<a name="line.53"></a>
<span class="sourceLineNo">054</span><a name="line.54"></a>
<span class="sourceLineNo">055</span>    /**<a name="line.55"></a>
<span class="sourceLineNo">056</span>     * Use the traditional `resolve' merge algorithm.<a name="line.56"></a>
<span class="sourceLineNo">057</span>     */<a name="line.57"></a>
<span class="sourceLineNo">058</span>    RESOLVE {<a name="line.58"></a>
<span class="sourceLineNo">059</span>        @Override<a name="line.59"></a>
<span class="sourceLineNo">060</span>        void addOptions(List&lt;String&gt; args) {<a name="line.60"></a>
<span class="sourceLineNo">061</span>            args.add("--strategy=resolve");<a name="line.61"></a>
<span class="sourceLineNo">062</span>        }<a name="line.62"></a>
<span class="sourceLineNo">063</span>    },<a name="line.63"></a>
<span class="sourceLineNo">064</span><a name="line.64"></a>
<span class="sourceLineNo">065</span>    /**<a name="line.65"></a>
<span class="sourceLineNo">066</span>     * Use the `recursive' merge algorithm.<a name="line.66"></a>
<span class="sourceLineNo">067</span>     */<a name="line.67"></a>
<span class="sourceLineNo">068</span>    RECURSIVE {<a name="line.68"></a>
<span class="sourceLineNo">069</span>        @Override<a name="line.69"></a>
<span class="sourceLineNo">070</span>        void addOptions(List&lt;String&gt; args) {<a name="line.70"></a>
<span class="sourceLineNo">071</span>            args.add("--strategy=recursive");<a name="line.71"></a>
<span class="sourceLineNo">072</span>        }<a name="line.72"></a>
<span class="sourceLineNo">073</span>    },<a name="line.73"></a>
<span class="sourceLineNo">074</span><a name="line.74"></a>
<span class="sourceLineNo">075</span>    /**<a name="line.75"></a>
<span class="sourceLineNo">076</span>     * Use the `recursive' merge algorithm, resolving conflicts in favor of our branch.<a name="line.76"></a>
<span class="sourceLineNo">077</span>     */<a name="line.77"></a>
<span class="sourceLineNo">078</span>    RECURSIVE_OURS {<a name="line.78"></a>
<span class="sourceLineNo">079</span>        @Override<a name="line.79"></a>
<span class="sourceLineNo">080</span>        void addOptions(List&lt;String&gt; args) {<a name="line.80"></a>
<span class="sourceLineNo">081</span>            args.add("--strategy=recursive");<a name="line.81"></a>
<span class="sourceLineNo">082</span>            args.add("--strategy-option=ours");<a name="line.82"></a>
<span class="sourceLineNo">083</span>        }<a name="line.83"></a>
<span class="sourceLineNo">084</span>    },<a name="line.84"></a>
<span class="sourceLineNo">085</span><a name="line.85"></a>
<span class="sourceLineNo">086</span>    /**<a name="line.86"></a>
<span class="sourceLineNo">087</span>     * Use the `recursive' merge algorithm, resolving conflicts in favor of the other branch.<a name="line.87"></a>
<span class="sourceLineNo">088</span>     */<a name="line.88"></a>
<span class="sourceLineNo">089</span>    RECURSIVE_THEIRS {<a name="line.89"></a>
<span class="sourceLineNo">090</span>        @Override<a name="line.90"></a>
<span class="sourceLineNo">091</span>        void addOptions(List&lt;String&gt; args) {<a name="line.91"></a>
<span class="sourceLineNo">092</span>            args.add("--strategy=recursive");<a name="line.92"></a>
<span class="sourceLineNo">093</span>            args.add("--strategy-option=theirs");<a name="line.93"></a>
<span class="sourceLineNo">094</span>        }<a name="line.94"></a>
<span class="sourceLineNo">095</span>    },<a name="line.95"></a>
<span class="sourceLineNo">096</span><a name="line.96"></a>
<span class="sourceLineNo">097</span>    /**<a name="line.97"></a>
<span class="sourceLineNo">098</span>     * Use the `recursive' merge algorithm with the `patience' option.<a name="line.98"></a>
<span class="sourceLineNo">099</span>     */<a name="line.99"></a>
<span class="sourceLineNo">100</span>    RECURSIVE_PATIENCE {<a name="line.100"></a>
<span class="sourceLineNo">101</span>        @Override<a name="line.101"></a>
<span class="sourceLineNo">102</span>        void addOptions(List&lt;String&gt; args) {<a name="line.102"></a>
<span class="sourceLineNo">103</span>            args.add("--strategy=recursive");<a name="line.103"></a>
<span class="sourceLineNo">104</span>            args.add("--strategy-option=patience");<a name="line.104"></a>
<span class="sourceLineNo">105</span>        }<a name="line.105"></a>
<span class="sourceLineNo">106</span>    },<a name="line.106"></a>
<span class="sourceLineNo">107</span><a name="line.107"></a>
<span class="sourceLineNo">108</span>    /**<a name="line.108"></a>
<span class="sourceLineNo">109</span>     * Use the `recursive' merge algorithm with the `patience' option, resolving conflicts in favor of our branch.<a name="line.109"></a>
<span class="sourceLineNo">110</span>     */<a name="line.110"></a>
<span class="sourceLineNo">111</span>    RECURSIVE_PATIENCE_OURS {<a name="line.111"></a>
<span class="sourceLineNo">112</span>        @Override<a name="line.112"></a>
<span class="sourceLineNo">113</span>        void addOptions(List&lt;String&gt; args) {<a name="line.113"></a>
<span class="sourceLineNo">114</span>            args.add("--strategy=recursive");<a name="line.114"></a>
<span class="sourceLineNo">115</span>            args.add("--strategy-option=patience");<a name="line.115"></a>
<span class="sourceLineNo">116</span>            args.add("--strategy-option=ours");<a name="line.116"></a>
<span class="sourceLineNo">117</span>        }<a name="line.117"></a>
<span class="sourceLineNo">118</span>    },<a name="line.118"></a>
<span class="sourceLineNo">119</span><a name="line.119"></a>
<span class="sourceLineNo">120</span>    /**<a name="line.120"></a>
<span class="sourceLineNo">121</span>     * Use the `recursive' merge algorithm with the `patience' option, resolving conflicts in favor of the other branch.<a name="line.121"></a>
<span class="sourceLineNo">122</span>     */<a name="line.122"></a>
<span class="sourceLineNo">123</span>    RECURSIVE_PATIENCE_THEIRS {<a name="line.123"></a>
<span class="sourceLineNo">124</span>        @Override<a name="line.124"></a>
<span class="sourceLineNo">125</span>        void addOptions(List&lt;String&gt; args) {<a name="line.125"></a>
<span class="sourceLineNo">126</span>            args.add("--strategy=recursive");<a name="line.126"></a>
<span class="sourceLineNo">127</span>            args.add("--strategy-option=patience");<a name="line.127"></a>
<span class="sourceLineNo">128</span>            args.add("--strategy-option=theirs");<a name="line.128"></a>
<span class="sourceLineNo">129</span>        }<a name="line.129"></a>
<span class="sourceLineNo">130</span>    };<a name="line.130"></a>
<span class="sourceLineNo">131</span><a name="line.131"></a>
<span class="sourceLineNo">132</span>    /**<a name="line.132"></a>
<span class="sourceLineNo">133</span>     * Peform a merge using this strategy, without committing.<a name="line.133"></a>
<span class="sourceLineNo">134</span>     * This assumes the checkout directory is prepared appropriately for the merge with the target branch checked out.<a name="line.134"></a>
<span class="sourceLineNo">135</span>     *<a name="line.135"></a>
<span class="sourceLineNo">136</span>     * @param dir checkout directory<a name="line.136"></a>
<span class="sourceLineNo">137</span>     * @param other other branch to merge with<a name="line.137"></a>
<span class="sourceLineNo">138</span>     * @throws IllegalArgumentException if {@code dir} or {@code other} is null<a name="line.138"></a>
<span class="sourceLineNo">139</span>     * @throws GitMergeConflictException if a merge conflict occurs<a name="line.139"></a>
<span class="sourceLineNo">140</span>     * @throws GitException if an error other than a merge conflict occurs<a name="line.140"></a>
<span class="sourceLineNo">141</span>     */<a name="line.141"></a>
<span class="sourceLineNo">142</span>    public void merge(File dir, String other) {<a name="line.142"></a>
<span class="sourceLineNo">143</span><a name="line.143"></a>
<span class="sourceLineNo">144</span>        // Run merge command<a name="line.144"></a>
<span class="sourceLineNo">145</span>        final GitCommand merge = this.buildMergeCommand(dir, other);<a name="line.145"></a>
<span class="sourceLineNo">146</span>        final int exitValue = merge.run(true);<a name="line.146"></a>
<span class="sourceLineNo">147</span><a name="line.147"></a>
<span class="sourceLineNo">148</span>        // Any conflict or other error?<a name="line.148"></a>
<span class="sourceLineNo">149</span>        if (exitValue == 0)<a name="line.149"></a>
<span class="sourceLineNo">150</span>            return;<a name="line.150"></a>
<span class="sourceLineNo">151</span><a name="line.151"></a>
<span class="sourceLineNo">152</span>        // Check for errors other than conflict<a name="line.152"></a>
<span class="sourceLineNo">153</span>        final File mergeHeadFile = new File(new File(dir, ".git"), "MERGE_HEAD");<a name="line.153"></a>
<span class="sourceLineNo">154</span>        if (!mergeHeadFile.exists())<a name="line.154"></a>
<span class="sourceLineNo">155</span>            throw new GitException("git merge failed: " + merge.getStandardError().trim());<a name="line.155"></a>
<span class="sourceLineNo">156</span><a name="line.156"></a>
<span class="sourceLineNo">157</span>        // Abort the merge<a name="line.157"></a>
<span class="sourceLineNo">158</span>        new GitCommand(dir, "merge", "--abort").run();<a name="line.158"></a>
<span class="sourceLineNo">159</span><a name="line.159"></a>
<span class="sourceLineNo">160</span>        // Bail out<a name="line.160"></a>
<span class="sourceLineNo">161</span>        throw new GitMergeConflictException("merge failed with conflict(s)");<a name="line.161"></a>
<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
<span class="sourceLineNo">163</span><a name="line.163"></a>
<span class="sourceLineNo">164</span>    /**<a name="line.164"></a>
<span class="sourceLineNo">165</span>     * Build the merge command. Delegates to {@link #addOptions} for strategy-specific merge command options.<a name="line.165"></a>
<span class="sourceLineNo">166</span>     *<a name="line.166"></a>
<span class="sourceLineNo">167</span>     * @param dir checkout directory<a name="line.167"></a>
<span class="sourceLineNo">168</span>     * @param other other branch to merge with<a name="line.168"></a>
<span class="sourceLineNo">169</span>     * @throws IllegalArgumentException if {@code dir} or {@code other} is null<a name="line.169"></a>
<span class="sourceLineNo">170</span>     */<a name="line.170"></a>
<span class="sourceLineNo">171</span>    private GitCommand buildMergeCommand(File dir, String other) {<a name="line.171"></a>
<span class="sourceLineNo">172</span><a name="line.172"></a>
<span class="sourceLineNo">173</span>        // Sanity check<a name="line.173"></a>
<span class="sourceLineNo">174</span>        if (other == null)<a name="line.174"></a>
<span class="sourceLineNo">175</span>            throw new IllegalArgumentException("null other");<a name="line.175"></a>
<span class="sourceLineNo">176</span><a name="line.176"></a>
<span class="sourceLineNo">177</span>        // Build command<a name="line.177"></a>
<span class="sourceLineNo">178</span>        final GitCommand merge = new GitCommand(dir, "merge", "--no-commit", "--no-ff");<a name="line.178"></a>
<span class="sourceLineNo">179</span>        this.addOptions(merge.getArgs());<a name="line.179"></a>
<span class="sourceLineNo">180</span>        merge.getArgs().add("--");<a name="line.180"></a>
<span class="sourceLineNo">181</span>        merge.getArgs().add(other);<a name="line.181"></a>
<span class="sourceLineNo">182</span>        return merge;<a name="line.182"></a>
<span class="sourceLineNo">183</span>    }<a name="line.183"></a>
<span class="sourceLineNo">184</span><a name="line.184"></a>
<span class="sourceLineNo">185</span>    /**<a name="line.185"></a>
<span class="sourceLineNo">186</span>     * Add the appropriate {@code git merge} command line flags.<a name="line.186"></a>
<span class="sourceLineNo">187</span>     */<a name="line.187"></a>
<span class="sourceLineNo">188</span>    abstract void addOptions(List&lt;String&gt; args);<a name="line.188"></a>
<span class="sourceLineNo">189</span>}<a name="line.189"></a>
<span class="sourceLineNo">190</span><a name="line.190"></a>




























































</pre>
</div>
</body>
</html>
